Finalized my part of #455