General Functions updates...