removed extra data nesting