Better commenting. Now code is in BETA officially