minor changes ready to change time to fun