Wip Added more moethods