Reverted back to Attempt #6 commit