Marius Miliunas - renamed some methods