updated code loading