#20 Moved it over similar to issue #19