Switched to uint16 from uint32