minor changes, started using atoms