added changes from coreProject