Some random changes Sam made