Committing end point script
reference fix
bug fixes