fixing stuff 2