added seperators and bug fix