Reverted to original Code I had