Merged with changes made in latest project