fixed D, U is still broken