slight modifications to follow conventions