changed to new wiki format