added my methods, once more. Should be close to final