added stuff 7