yeah .. i guess it makes sense to merge this as well.