Reverted to clean slate
Reverting to simpler version