added some small updates renamed some methods:)