NOW final changes to src files