modifying core, not working yet
restoration of existing tests
cyclotronic