need to redo logic