Removed columns and fixed overflow