Modified. Pastio source restructured