added spot support