Initial positioning changes for tps and clock