work done as of sprint 100 - 2.8.6 development