Re-written small plants. Please test and let me know if they still behave as they should