...Simplified after revision