Standard changes implemented