Fixed a dumb mistake in statics
merging some statics