Switched shifts data type to int
Performance tuning