final v1.1 working