Changes to stick to new guidelines