Initial modifications for project