Updated as suggested by Manoj