Made some changes locally and ready to test it on server