Changes I missd from previous commit