set is now a shot type
merged changes