Continue work on user logic