modifications to handle requirements changes