adjustments to make it working