removed some stuff for new try #21