simplified a few method names