added a bit more to make UI friendlier