Bringing my code up to date