Reintegrated core into FSCL. Submodule solution not suitable