Finished SD changes