few changes on raise call