refactor
tried to add cursors
added email