Got rid of orientation and simplified 3MP and 5MP processing