Changed values from 1 byte to 2 bytes