i hope this works. had some merge problems