swapped entry point, added version