Merging with dan
Fixed conflict