Reverted back to changes ~3pm 6/6/14