Adden wrapper - all bugs removed...