Reverted back to 2.0.2, moved changes since into a new branch