deleted and combined some