Cleaned up dup method