changed dsl around a bit