Size changes, added flip support