all methods fix