removed some pit... code left