Moved Ore to make neater
Added gas