removed more redundant method