fix for placeholder
improve code