Removed scripts and reordered everything
Works on GInstant