Removed index stuff, added additional delimiters