updated dev april 30