now with more working