Improved Context form