Issues #72, #73, #74