Fix ALL the code