Fixed very slow behaviour on sgs, improved graph