added self on some places