Updated as suggested by Kuldeep