did some work on Core project