Fixed connextions and added safety first