Remove die() from code
Big update