Reverted the basic changes

Minor fixes