Working on the #19 and #15