Updated tags for the rewrite

Signed-off-by: Iancu Vladi <vladi.iancu@siteup.ro>