Feature/sleep mode update