now works with latest galfit