updated & edited