Fixed things but black screen