changes to some methods