v1.2 (Also reverting ibJarrett's mess)