refactored sources to meet pullReq.