Development: more changes