updates & code changes