Cleaned up for Pinicc
Updated picnicc