a bit more working now