Some final stuff - final version (may be unstable)