added handler for s
fixed conflict