Improvent on applications.js