Small updates on my martin design