more working now