consolidate added...needs to be debugged