cleaned up, implemented removed, busy with reassembling picture