Final changes for Crystal Ball project