yes it is working!!!!!!!
cleaned up code and merge changed