fixed adrian's mistakes