Cleaned version 1.0.3