Promethease update. Rearrange stuff.