Shouldn't this be moved up too?