Fixed changes from Akash