Slight modifications on last commit