deleting un-needed code
merging