added methods to hopefully get it to work