yay - works
no more redundancy