added remaining stuff