Final round, code is now simpler