started support for atom and moved to java 6