New Version, added some stuff from An1E