Names changed + some design