Updated after the last bug fixes