worked on this more