amending last commit with manual changes