a few changes based on testing with application
0.0.3