fireball commit
merged with latest changes