Optimized logic

Data is now available across views