resolved code parsing problems, temporarily