More flirt project changes