reverting back to original version that was working