removed duplicated code in the base