this is much cleaner. it would be nice if we didn't also have to manage this in our apps. is that the case now?