Made more robust and added separators