Version 0.3 small modification