tidy up controller
add delay to test scenario