modifications to follow conventions