it works!

Simplfied and improved things