Updated after last comment