reverted a previous revision and  few changes