Trying to revert to a more workable version