adding some user logic, deleted helpers