script added and structure remake