sorry for bad merge .. fixed