Modifed default and post to load scripts correctly