get rid of static methods. refactor. fixed #3
frontend logic fixed due to last changes