fixed a little bug and got rid of the commons-parent