Cleaned experimental code