3 Commits (fixTypesAgain)