make round handling more simpler