fixed things sortof