added s4 support