Misc updated