Modifications to use #! settings