fixed the dup code thing