added cstick support