currently fixing errors