working
fixed minor bug