Added some round logic