adding latest tweaks from gever 

adding latest tweaks from gever