Fixed function order, moved all to vector