make dem run :) and much simpler