removed panic handling