Added space.js and app.'s modifications