merged and tests passing