js import better and start of state update
reorganize statics