Slight modifications...