modified core and added development options