Added methods
Fixed errors