updated for merge
added constants for direction