Dev zch

@ByzanTine 
Move it to .cpp