Updated Crystal WIP