gapi updates, halfway done