works a bit more now...