Finish working on 9.3