#2:Implemented. Added full body source support