some small changes made