Adding changes as required