Changed initialization vars