Added some minor modifications