Just some slight modifications