implemented own features
merged file