working shit before merging
replacing fbjs
restart