changed method ordering