Added back everything, hopefully fixed all issues