Updated signature, some fine tuning