renamed methods
added a fixme