Updated to reflect current direction