Better portrait control