LIttle fix & new headers
deleted unuseful methods