updated loading actions based on bug