updated #165, removed unnecessary methods