Updated to latest standards