commit for freetime manager ( ongoing)