updated source
updated style