Added dimensions
Finish merge