added changes from Vinil