Fixed bugginess - no more lists