refactored the hot algorithm
Merge branch 'development'