Reverting back to workable version