Drop changes and final assembly