added stuff. needs testing