removed some header stuff and signals