Fixing bug, reverting back to version 6