First version that works with atom