Updated Vision part, not finished yet