Changes to allow multiple directions