added further controls and module to increase readibility