re-add ac stuff until we have something better