removing die() testing code :|