ui adds + better simple logic
change name