Separated problems from main.js

~