addressed Mech's note during CR: we agreed it still can be done better and we'll work on it in next sprints