7 Commits (dev-amery-basic)