Final modifcation

reverting to the original setup