Done #14 and #15