fixed most of the issues raised by Venesa