added stuff 8