Fixed "New" Functionality