Changed to new reqs and improved design.