Started to add a new dimension + some changes