Reverted to old functionality after ui reverted