Patched for later use ver. 0.0.1_4