Changed stuff to fit Celf syntax