Implemented suggested changes by Ravi