Finalize #4 and #5