stuff working slightly better