Final fix
Split in separate file