Fixed resolution to match 3.0 and added trimming