finishing up #23 and #24