Adding arichnad's ignore, with some small changes