Acts revised to get all info from the start. This is ugly as hell