Kevin swipe composer fix

Merged with thibultizanini codes