Rfinnigan changes

Please review this, @casey-collab