Updated to be compatible with the ci