Added positioning handling