stuck in methods
Merge branch 'author_nadrow'