added changes for clasp