Works much nicer now