Abdullah - design changes - super1 user