Pictures conversion
Pictures refactoring
Minor changes
Minor changes