added tags and made life easier