Check these modifications. What do you think?