Added orientation inferrence