Final changes for sprint