removed repeated functionality