Reverted to original MakeFile with minor changes