changed some things to remove warning from the marketplace