if you can do what I suggested above then this can be simplified