Updated with January Advanced class