Changed some clones to static versions