revert to original style--figure out later