Modified access flow - still need to work on time