All working now hopefully