Finished first part of 3.3