con and cylinder implemented
merged fixed