fixing stuff with shaun