Re-applied changed from vineeth