Added Wake up calls
fix merge issues