Finishing up to #41