Continue working on GL version