Fixed to percentage calculations!