added to todo removal of /24