Changed to lookup table and using integers