has been modified to jquery