made the user fix from previous commit better and fixed keywords in the same way