added a bit more funtionality, missing models