major naming fxing, was working perfectly before this