added stuff that should be ready for cps