Changed for good coding