changed methods to account for type change