added my name
extended functionality