cleaed up basic section