Full pic functionality added