enough of this! I'm fixing this for good this week