worked on converting to gem