updated some methods