removed duplicate checks