Now tags work well some functionality added