Changes to support function reuse
I removed the bedtime goals for now so removing this code usage