Hack away segments bug... clean things up soon...