cleaned up duplication