Finalize Indoor coding changes

Input the coding changes for the final version