switched to using Application singleton