added tag usage
changed some method names