modifid things a bit