worked a bit more on it