fixing messiness
with mark