some controls added