Added more preliminar stuff