7 Commits (fixTypesAgain)