made some minor changes forconvenidnce of use