orientation capability added
resolved conflicts