Added a few things from another project