some minor modifications..