Cleaned up for backbone.
More conversion