Removed the obsolete logic of "-1 unit" and polished