updated with some from 7dfps